Make robust to deprecations removals #168

ChrisRackauckas · 2025-03-27T12:15:49Z

No description provided.

JoshuaLampert · 2025-03-27T12:26:38Z

Does this close SciML/OrdinaryDiffEq.jl#2639?

kellertuer · 2025-03-27T12:43:36Z

That error you posted at leat looks very very similar to the one that we discussed on Slack and that lead to this PR – so, maybe (or probably) that solves it, yes.

github-actions

Remaining comments which cannot be posted as a review comment to avoid GitHub Rate Limit

JuliaFormatter

[JuliaFormatter] _{reported by reviewdog 🐶}

SimpleNonlinearSolve.jl/src/termination_conditions_deprecated.jl

Lines 171 to 172 in 5ef1936

    
           patience_objective_multiplier = 3, 
        
           min_max_factor = 1.3) where {T}

[JuliaFormatter] _{reported by reviewdog 🐶}

SimpleNonlinearSolve.jl/src/termination_conditions_deprecated.jl

Lines 187 to 189 in 5ef1936

    
                   NLSolveSafeTerminationResult, 
        
                   Nothing 
        
           })

[JuliaFormatter] _{reported by reviewdog 🐶}

SimpleNonlinearSolve.jl/src/termination_conditions_deprecated.jl

Lines 195 to 196 in 5ef1936

    
           return _termination_condition_closure_basic(get_du(integrator), integrator.u, 
        
               integrator.uprev, abstol, reltol)

[JuliaFormatter] _{reported by reviewdog 🐶}

SimpleNonlinearSolve.jl/src/termination_conditions_deprecated.jl

Lines 207 to 208 in 5ef1936

    
           return _termination_condition_closure_safe(get_du(integrator), integrator.u, 
        
               integrator.uprev, abstol, reltol)

[JuliaFormatter] _{reported by reviewdog 🐶}

SimpleNonlinearSolve.jl/src/utils.jl

Lines 177 to 178 in 5ef1936

    
           return check_termination( 
        
               tc_cache, fx, x, xo, prob, alg, get_termination_mode(tc_cache))

github-actions · 2025-03-27T14:36:37Z

src/SimpleNonlinearSolve.jl

+export NLSolveTerminationMode,
+       NLSolveSafeTerminationOptions, NLSolveTerminationCondition,


[JuliaFormatter] _{reported by reviewdog 🐶}

Suggested change

export NLSolveTerminationMode,

NLSolveSafeTerminationOptions, NLSolveTerminationCondition,

export NLSolveTerminationMode, NLSolveSafeTerminationOptions, NLSolveTerminationCondition,

github-actions

Remaining comments which cannot be posted as a review comment to avoid GitHub Rate Limit

JuliaFormatter

[JuliaFormatter] _{reported by reviewdog 🐶}

SimpleNonlinearSolve.jl/src/termination_conditions_deprecated.jl

Lines 149 to 150 in 89e640c

    
           struct NLSolveTerminationCondition{mode, T, 
        
               S <: Union{<:NLSolveSafeTerminationOptions, Nothing}}

[JuliaFormatter] _{reported by reviewdog 🐶}

SimpleNonlinearSolve.jl/src/termination_conditions_deprecated.jl

Lines 171 to 172 in 89e640c

    
           patience_objective_multiplier = 3, 
        
           min_max_factor = 1.3) where {T}

[JuliaFormatter] _{reported by reviewdog 🐶}

SimpleNonlinearSolve.jl/src/termination_conditions_deprecated.jl

Lines 187 to 189 in 89e640c

    
                   NLSolveSafeTerminationResult, 
        
                   Nothing 
        
           })

[JuliaFormatter] _{reported by reviewdog 🐶}

SimpleNonlinearSolve.jl/src/termination_conditions_deprecated.jl

Lines 195 to 196 in 89e640c

    
           return _termination_condition_closure_basic(get_du(integrator), integrator.u, 
        
               integrator.uprev, abstol, reltol)

[JuliaFormatter] _{reported by reviewdog 🐶}

SimpleNonlinearSolve.jl/src/termination_conditions_deprecated.jl

Lines 207 to 208 in 89e640c

    
           return _termination_condition_closure_safe(get_du(integrator), integrator.u, 
        
               integrator.uprev, abstol, reltol)

[JuliaFormatter] _{reported by reviewdog 🐶}

SimpleNonlinearSolve.jl/src/utils.jl

Lines 177 to 178 in 89e640c

    
           return check_termination( 
        
               tc_cache, fx, x, xo, prob, alg, get_termination_mode(tc_cache))

github-actions · 2025-03-27T15:33:15Z

src/termination_conditions.jl

+    :AbsNorm => doc"``\| \Delta u \| \leq abstol``."
+)


[JuliaFormatter] _{reported by reviewdog 🐶}

Suggested change

:AbsNorm => doc"``\| \Delta u \| \leq abstol``."

)

:AbsNorm => doc"``\| \Delta u \| \leq abstol``.")

github-actions · 2025-03-27T15:33:15Z

src/termination_conditions.jl

+                return new{__norm_type(f), typeof(max_stalled_steps), F,
+                    typeof(protective_threshold), typeof(patience_objective_multiplier),
+                    typeof(min_max_factor)}(f, protective_threshold, patience_steps,


[JuliaFormatter] _{reported by reviewdog 🐶}

Suggested change

return new{__norm_type(f), typeof(max_stalled_steps), F,

typeof(protective_threshold), typeof(patience_objective_multiplier),

typeof(min_max_factor)}(f, protective_threshold, patience_steps,

return new{__norm_type(f), typeof(max_stalled_steps),

F, typeof(protective_threshold),

typeof(patience_objective_multiplier), typeof(min_max_factor)}(

f, protective_threshold, patience_steps,

github-actions · 2025-03-27T15:33:16Z

src/termination_conditions.jl

+@concrete mutable struct NonlinearTerminationModeCache{dep_retcode,
+    M <: AbstractNonlinearTerminationMode,


[JuliaFormatter] _{reported by reviewdog 🐶}

Suggested change

@concrete mutable struct NonlinearTerminationModeCache{dep_retcode,

M <: AbstractNonlinearTerminationMode,

@concrete mutable struct NonlinearTerminationModeCache{

dep_retcode, M <: AbstractNonlinearTerminationMode,

github-actions · 2025-03-27T15:33:16Z

src/termination_conditions.jl

+function SciMLBase.init(du::Union{AbstractArray{T}, T}, u::Union{AbstractArray{T}, T},
+        mode::AbstractNonlinearTerminationMode, saved_value_prototype...;
+        use_deprecated_retcodes::Val{D} = Val(true),  # Remove in v8, warn in v7
+        abstol = nothing, reltol = nothing, kwargs...) where {D, T <: Number}


[JuliaFormatter] _{reported by reviewdog 🐶}

Suggested change

abstol = nothing, reltol = nothing, kwargs...) where {D, T <: Number}

abstol = nothing,

reltol = nothing, kwargs...) where {D, T <: Number}

github-actions · 2025-03-27T15:33:16Z

src/termination_conditions.jl

+                          Vector{TT}(undef, mode.max_stalled_steps)
+        best_value = initial_objective
+        max_stalled_steps = mode.max_stalled_steps
+        if ArrayInterface.can_setindex(u_) && !(u_ isa Number) &&


[JuliaFormatter] _{reported by reviewdog 🐶}

Suggested change

if ArrayInterface.can_setindex(u_) && !(u_ isa Number) &&

if ArrayInterface.can_setindex(u_) &&

!(u_ isa Number) &&

github-actions · 2025-03-27T15:33:19Z

src/termination_conditions_deprecated.jl

+function NLSolveSafeTerminationResult(u = nothing; best_objective_value = Inf64,
+        best_objective_value_iteration = 0,


[JuliaFormatter] _{reported by reviewdog 🐶}

Suggested change

function NLSolveSafeTerminationResult(u = nothing; best_objective_value = Inf64,

best_objective_value_iteration = 0,

function NLSolveSafeTerminationResult(

u = nothing; best_objective_value = Inf64, best_objective_value_iteration = 0,

github-actions · 2025-03-27T15:33:19Z

src/termination_conditions_deprecated.jl

+    return NLSolveSafeTerminationResult{typeof(best_objective_value), typeof(u)}(u,
+        best_objective_value, best_objective_value_iteration, return_code)


[JuliaFormatter] _{reported by reviewdog 🐶}

Suggested change

return NLSolveSafeTerminationResult{typeof(best_objective_value), typeof(u)}(u,

best_objective_value, best_objective_value_iteration, return_code)

return NLSolveSafeTerminationResult{typeof(best_objective_value), typeof(u)}(

u, best_objective_value, best_objective_value_iteration, return_code)

github-actions · 2025-03-27T15:33:19Z

src/termination_conditions_deprecated.jl

+    NLSolveTerminationMode.NLSolveDefault,
+    NLSolveTerminationMode.Norm, NLSolveTerminationMode.Rel,
+    NLSolveTerminationMode.RelNorm,


[JuliaFormatter] _{reported by reviewdog 🐶}

Suggested change

NLSolveTerminationMode.NLSolveDefault,

NLSolveTerminationMode.Norm, NLSolveTerminationMode.Rel,

NLSolveTerminationMode.RelNorm,

NLSolveTerminationMode.NLSolveDefault, NLSolveTerminationMode.Norm,

NLSolveTerminationMode.Rel, NLSolveTerminationMode.RelNorm,

github-actions · 2025-03-27T15:33:19Z

src/termination_conditions_deprecated.jl

+const SAFE_TERMINATION_MODES = (NLSolveTerminationMode.RelSafe,
+    NLSolveTerminationMode.RelSafeBest,
+    NLSolveTerminationMode.AbsSafe,
+    NLSolveTerminationMode.AbsSafeBest)


[JuliaFormatter] _{reported by reviewdog 🐶}

Suggested change

const SAFE_TERMINATION_MODES = (NLSolveTerminationMode.RelSafe,

NLSolveTerminationMode.RelSafeBest,

NLSolveTerminationMode.AbsSafe,

NLSolveTerminationMode.AbsSafeBest)

const SAFE_TERMINATION_MODES = (

NLSolveTerminationMode.RelSafe, NLSolveTerminationMode.RelSafeBest,

NLSolveTerminationMode.AbsSafe, NLSolveTerminationMode.AbsSafeBest)

github-actions · 2025-03-27T15:33:19Z

src/termination_conditions_deprecated.jl

+const SAFE_BEST_TERMINATION_MODES = (NLSolveTerminationMode.RelSafeBest,
+    NLSolveTerminationMode.AbsSafeBest)


[JuliaFormatter] _{reported by reviewdog 🐶}

Suggested change

const SAFE_BEST_TERMINATION_MODES = (NLSolveTerminationMode.RelSafeBest,

NLSolveTerminationMode.AbsSafeBest)

const SAFE_BEST_TERMINATION_MODES = (

NLSolveTerminationMode.RelSafeBest, NLSolveTerminationMode.AbsSafeBest)

ChrisRackauckas added 2 commits March 27, 2025 08:15

Make robust to deprecations removals

9422b4b

bump alloccheck

abc05b4

add exports

5ef1936

ChrisRackauckas mentioned this pull request Mar 27, 2025

Downstream build broke today with *e.g.* UndefVarError: AbstractNonlinearTerminationMode not defined in SimpleNonlinearSolve SciML/DifferentialEquations.jl#1080

Closed

final fixes

89e640c

ChrisRackauckas merged commit b73c4b7 into main Mar 27, 2025
3 of 11 checks passed

ChrisRackauckas deleted the robust branch March 27, 2025 14:01

JoshuaLampert mentioned this pull request Mar 27, 2025

MPDeC methods NumericalMathematics/PositiveIntegrators.jl#146

Merged

9 tasks

github-actions bot reviewed Mar 27, 2025

View reviewed changes

	patience_objective_multiplier = 3,
	min_max_factor = 1.3) where {T}

	return _termination_condition_closure_basic(get_du(integrator), integrator.u,
	integrator.uprev, abstol, reltol)

	return _termination_condition_closure_safe(get_du(integrator), integrator.u,
	integrator.uprev, abstol, reltol)

	return check_termination(
	tc_cache, fx, x, xo, prob, alg, get_termination_mode(tc_cache))

		export NLSolveTerminationMode,
		NLSolveSafeTerminationOptions, NLSolveTerminationCondition,

	export NLSolveTerminationMode,
	NLSolveSafeTerminationOptions, NLSolveTerminationCondition,
	export NLSolveTerminationMode, NLSolveSafeTerminationOptions, NLSolveTerminationCondition,

	struct NLSolveTerminationCondition{mode, T,
	S <: Union{<:NLSolveSafeTerminationOptions, Nothing}}

	:AbsNorm => doc"``\\| \Delta u \\| \leq abstol``."
	)
	:AbsNorm => doc"``\\| \Delta u \\| \leq abstol``.")

		@concrete mutable struct NonlinearTerminationModeCache{dep_retcode,
		M <: AbstractNonlinearTerminationMode,

	abstol = nothing, reltol = nothing, kwargs...) where {D, T <: Number}
	abstol = nothing,
	reltol = nothing, kwargs...) where {D, T <: Number}

	if ArrayInterface.can_setindex(u_) && !(u_ isa Number) &&
	if ArrayInterface.can_setindex(u_) &&
	!(u_ isa Number) &&

		function NLSolveSafeTerminationResult(u = nothing; best_objective_value = Inf64,
		best_objective_value_iteration = 0,

		return NLSolveSafeTerminationResult{typeof(best_objective_value), typeof(u)}(u,
		best_objective_value, best_objective_value_iteration, return_code)

		const SAFE_BEST_TERMINATION_MODES = (NLSolveTerminationMode.RelSafeBest,
		NLSolveTerminationMode.AbsSafeBest)

Uh oh!

Make robust to deprecations removals #168

Make robust to deprecations removals #168

Uh oh!

Conversation

ChrisRackauckas commented Mar 27, 2025

Uh oh!

JoshuaLampert commented Mar 27, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

kellertuer commented Mar 27, 2025

Uh oh!

Uh oh!

github-actions bot left a comment

Choose a reason for hiding this comment

Uh oh!

github-actions bot Mar 27, 2025

Choose a reason for hiding this comment

Uh oh!

github-actions bot left a comment

Choose a reason for hiding this comment

Uh oh!

github-actions bot Mar 27, 2025

Choose a reason for hiding this comment

Uh oh!

github-actions bot Mar 27, 2025

Choose a reason for hiding this comment

Uh oh!

github-actions bot Mar 27, 2025

Choose a reason for hiding this comment

Uh oh!

github-actions bot Mar 27, 2025

Choose a reason for hiding this comment

Uh oh!

github-actions bot Mar 27, 2025

Choose a reason for hiding this comment

Uh oh!

github-actions bot Mar 27, 2025

Choose a reason for hiding this comment

Uh oh!

github-actions bot Mar 27, 2025

Choose a reason for hiding this comment

Uh oh!

github-actions bot Mar 27, 2025

Choose a reason for hiding this comment

Uh oh!

github-actions bot Mar 27, 2025

Choose a reason for hiding this comment

Uh oh!

github-actions bot Mar 27, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

JoshuaLampert commented Mar 27, 2025 •

edited

Loading